This MR merges the changes from the following MRs onto the release/0.13.x branch to finalise the 0.13.8 release: