Merge "Pass custom fallback info to minikin"