Applied it now, but dropped the Cc to stable, since this can't be
applied cleanly without your former patch, which wasn't merged to
stable either. If you'd like to move them to Cc, please inform the
all necessary upstream commit ids.