AI-499 : intermediate commit for mandatory flag support
Merge remote-tracking branch 'origin/version3' into version3