BRANCH 4.2-DEV: fixed bad merge