[DF-185] merge with development-qa