Integral fixes, last parts
Merge branch 'master' into fw_autoland