Merge "Change the fitting mode to FILL" into devel/master