BZ-12100 fixed claims check
Merge branch 'origin/master'