Finishes 2.3 fixes and additions
Merging