Did M2's become standard issue in 2016/2017?