Merge branch 'bugfix/as2-contentmap' into 'develop'