Merge "Use Surface layer for Surface operation." into jb-dev