all changes from 2674 / 806 in one place