Updated proposal by Chris N., WEK
Final version of 13104 submitted to TC for review