Merge branch 'WSDOT-dev'