MT-1235 [CR1235] Second 14.40 feature