Merge branch 'dev' into feature/foundation-apps-framework