7775 fix - merge with master