Merge branch 'release/1.0.0'
Dynamic marker position
Merge branch 'hotfix/1.0.1' into develop