stage-test branch, based on subversion id 237222