Changes for M2.7 compatibility