Commit for issue FQA-2062