NoSpace 3.0

ROB-23407