bringing work-in-progress gidget-config changes back to develop

(incorrectly merged to master)