SC#QCADOOCLS-1520 Fixed some conflicts and added missing code.
SC#QCADOOCLS-1520 Removed unused files.