Merge "sync up with helm configuration changes"