Merge "Merge "Append root cause with error message while parsing APEX" am: 411f31c8 am: 227d69ec am: 4825a02c" into sc-dev