MT-1279 [CR1233] Final 14.40 feature