Fix RPL-based marking and RPL checks in Multilayer context

See merge request !2319