Adjusted pawn, aixcave and maps alongside 5.2 and 5.3 branches.

David Gilbertrequested to merge
feature/backport into dev/5.1

Needs to be tested.

Merge request reports