Merge "Add feature to capture layer" into sc-dev