Merge "Apply fittingMode lazy when resource is not ready" into devel/master