Merge branch 'bugfix/as2-accept-json' into 'develop'