Merge "O-mr1 OPM1.170829.004 TAG Integration. Compilation issue fix"