am e1962531: am ecdecba2: (-s ours) am 016f55c2: am 690a2ec0: Merge "Making ClassObj comparison more precise." into studio-1.4-dev automerge: ad94953 automerge: 4c7890f

* commit 'e1962531570669500ed811055f883c579e18f95c':