Merge branch 'develop' into bug/JAL-4277_dirname_substitution_always_absolute