SI-8126 Put SI-6566 behind a source level flag