[LMAG] uplift to master