Merge branch feature/jorgen.lind/aws_kill_client_before_deinit with...

Merge branch feature/jorgen.lind/aws_kill_client_before_deinit with refs/heads/master into refs/merge-requests/137/train