This patch also affects also to Awn manager. We need feedback from other developers before merging this.
This patch also affects also to Awn manager. We need feedback from other developers before merging this.