Merge pull request #2665 from ehelms/bastion

Bastion - Merging master into branch.
Bastion: Adding new resources, re-factoring and updating inline
edits.