next marker functionality
Merge branch 'develop'