Fixes #5109
Fixes #4973
Drones fixes.
Fixes #5098
Typo.
Merge pull request #5111 from Zuhayr/master

Fixes