QA-169
added general after method