SONARIDE-411 Improve logging/profiling
SONARIDE-412 Improve performance of marker creation