BRANCH 4.1: fix for bad check-in