Merge branch 'develop' into task/JAL-3130_Java_11_investigations-getdown_src