This has not been exhaustively tested . Please test in the existing build bot + the bug case and merge .