Merge "Include cause in exceptions thrown by RecoveryController."