Merge branch 'development-proposed' into development-restricted-proposed