Do not use deprecated /e modifier
Merge branch 'sevice-container' into 1.4