merge changes from 4.4

Note that the only changes in this merge is one additional api example - this is intentional  - the point of this PR is to show all others as merged so they don't get merged later by accident