Merge branch 'm23_MDL-37449_Reports_ORA-00918_column_ambiguously_defined' of https...