Merge branch 'devel' into VH12I-A1
Merge branch 'VH12I-A1' of https://github.com/thopstaken/VH12IA into VH12I-A1