SONARIDE-412 Improve performance of marker creation
SONARIDE-410 Merge remote and local mode in a single action