Merge branch 'feature/configurable-pack-extensions' into 'develop'