sync 3
sync 4
sync 5
Merge branch '1.6.4' of https://github.com/Dolu1990/eln into 1.6.4