Ballast dev

Branch merge for features long in ballast security development branch.