Merge "Add FittingMode for image" into devel/master