13355-0229 3.0 Code update

Code included in the final 3.0 release