TQA-1256 commit 2013-06-18