Update from MR1 to MR2 (YARN)