Merge branch 'earmark' into 'develop'