Request to include a couple of fixes to stable branches