17.02.14 code changes

Also contains many of the code changes for 18.02.14