Merge branch 'feature/2.x/change-is-webapp' into 2.x