Merge branch 'ibm-trunk' into TypeRepo-with-ClassValue