Merge "(Automated Tests) Passing on Ubuntu 20.04" into devel/master