CSPACE-6053: Address remaining outstanding issues described in CSPACE-6053.