fix bug in text label overlap
Merge branch 'development' into staging