update 2-1-stable branch with changes from 2-0-stable

this merges some missing commits from repo