Import cia-foundation preservation fixes #1

Open
Ember Bot wants to merge 2 commits from preservation/cia-fixes into master
pull from: preservation/cia-fixes
2 Commits