
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a' * commit '257eef353dfc9519b63e3fe2616505c5534b460a': AI 147845: Compatibility mode support. Part 1
Merge commit '257eef353dfc9519b63e3fe2616505c5534b460a' * commit '257eef353dfc9519b63e3fe2616505c5534b460a': AI 147845: Compatibility mode support. Part 1