RTGOV-440
Merge branch 'mclay-RTGOV-440'
RTGOV-397
Merge branch 'mclay-RTGOV-397'