Merge "Ensure actor size is set to node if different" into devel/master