[z-push: 3/7] Merge branch 'el5' into el6