Merge "SF: Add support for boundless layers 2/2"