v4.11.18

Closed Sep 16, 2018 100% complete