Merge "Revert "Add context to customization class constructors""