Merge "Don't attach functor for SW layers"