Fix for ticket #1418: Mismatch between spec and VTM on signalling of sn_layer_id See merge request !1940