REL-2074: Changes as recommended by Rob.