r16786: * merge fix for BUG 3908 (pw change failure)