Modified adding/removing properties so two-level attributes can be used'
Merge remote-tracking branch 'origin/foil-bolt-merge' into bolt