Updated with enterprise-2.3.4-feature