Final files pushed to the public repo - jc58247,ma34897