RT# 74453 - V3 fixes for backport