Feature/612 fixes to 2.3.8