Merge "Add update storyboard script" into feature/zuulv3