Merge "Add context to customization class constructors"