Merge branch 'feature/canplay-as' into develop