4.10 api changes and fixed issues copied from list generated by @swill
3 files changed