Merge branch 'master' into rpi. Upgrade to Cubism 4 R4