merge from dev - US772 - changed check type on a test