backport until Nov.20 2013