fixes for CRM-14013
Merge pull request #14 from kurund/4.4

fixes for CRM-14013