Merge pull request #492 from apache/WW-5123-labelposition

[WW-5132] [WW-5123] labelposition - cherry-pick