Feature/upgrade to 2.3.18