backport until Nov.17 2013