Merge "Lock Pattern View - Visual update" into sc-dev