Adopt change 3.S1 proposed by the GLD WG in #254