backport until Jan.9 2014