backported pr's