BRANCH 4.3: fixes from code review