[DF-1427] Merged fix to development-qa