Merge pull request #4355 from guardian/an/scala2.13-syntax

Merge pull request #4355 from guardian/an/scala2.13-syntax #848