BRANCH 4.2-105: more tweaks