same with container/features
Merge remote-tracking branch 'origin/1.12' into features/sonar-cleanup