PYKE-549 - re-added more lost changes.