Merge branch 'es_backport' into 'master'

Backport some changes from EE



See merge request !2548