wrap aside elements in order to minimise empty space if they are undefinded
wrap aside elements in order to minimise empty space if they are undefinded

(cherry picked from commit 5298bdbede6a09c7a5e69562c27b2f54d929ba28)
Signed-off-by: Sascha Wagner <5b08bdb72bb1c2810fe64e2d5f186da64da75f68@gmail.com>

sashw/Flexmod,sashw/Flexmod,sashw/Flexmod