Dev work related to volume automounting, not ready for others to use this yet
Merge remote-tracking branch 'origin/feature/brian_1.2_features' into feature/brian_1.2_features