Puts SI-6899 fix under a source level flag
Put SI-7335 fix behind a source level flag