direct apply of gingerdx-common files