Merge changes from topic 'yardstick-docker-gambia'