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