MT-1600 [CR1233] MT-1600 commit #2 feature