TQA-1256 commit 20130626