catchup commit
start change from assertion to claim
finish java specific changes for supporing change from Assert to Claim