CLDINT-910 changes, including two pull requests from github, for version 1.0 based on PLF 3.5.6