Merge branch '0.8.4' into feature-raspberry-libs