updates from changes introduced by commit ae36569ba0