Merge "Update patterned ripple mask when changed" into sc-dev