3rd part of the layer/profile rework [2/2]