Develop Integration Branch -- 2020 week 19
The following Merge Requests were included:
Also add fixes for CI