TQA-1588: merge proposed branch to master