Merge "Dont persist config on failure" into gingerbread