19.02.14 code changes

Also contains about half of the code changes for 21.02.14