Merge pull request #527 from dhalperi/cherry-pick-properties

Cherry pick properties and update for release.