Merge "Store config file with gid1" into pi-dev