standards alignment
Merge branch 'standards-alignment'