Merge "Fixing NPE caused by postponed action relaying on controllers." into main