Merge "Improve fall out case handling"