This is the content of PR16 with squished commits and against develop instad of master
Since this was reviewed and approved in 16, I'm merging it into develop
Pull-Request has been merged by tflink
This is the content of PR16 with squished commits and against develop instad of master