Please check [8-0-stable]) for previous changes.