Further updates per std-proposals list feedback