#205: Greener/Dax's Sep 26 changes

Change request updated 2 months ago