Fixed bug #10119 and also change for schemaV3