repositioning
bug fixes
Merge remote-tracking branch 'refs/remotes/origin/Hotfix/positioning' into develop