[B#1294] more updates