MT-1236 [CR1235] Third 14.40 feature