Merge "Replace use of assertType with assertInternalType and assertInstanceOf"