Enterprise feature request from @fleischhoernchen