MOE_15: way-etc upgrade