Merge "Use Vector4 for the update area" into devel/master