Merge "Rename visual fitting mode property" into devel/master