Further modifications and additions for V2
Authored by: bloehr 2019-07-10
Parent: [r1934]
Child: [r1936]