First attempt and cleanup
Final version of ACU fix
Port fix to sACU and clean up whitespace
Merge remote-tracking branch 'icedreamer/ACU-Drone-Bugfix' into develop