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