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