Merge branch 'bugfix/earmark_renderer_test' into 'develop'