Comment correction for getFallback()
Merge and fix conflicts.