Merge branch 'dev' into 'historical_route'

Merge branch 'historical_route' into 'dev'

See merge request new-business/drp-web!166