Putting this into stable, because it might help debugging certain issues, and also making the user aware what's happening.