Merge remote-tracking branch 'origin/bkchr-fix-bugs-in-availability-distribution' into bernhard-refactor-avail-dist-test
