Merge "On state change, visuals now keep instance data" into devel/master