Merge branch 'feature/masto_api_markers' into 'develop'