Fix #808Signed-off-by: Ross Allan <[email protected]> (commit: 412723b)
Fix #800Signed-off-by: Ross Allan <[email protected]> (commit: f994c19)