Merge Master Updates - classfile changes