#2490 - Standards Update