Synchronizing/merging updates adding testing coverage with checkstyle. May need to re-apply checkstyle.