Fix Editor & Spec - M1-r12784