DF#QCADOOMESCLS-859, QCADOOMESCLS-893, QCADOOMESCLS-892 fixes in pps