Merge branch 'master' into fullstack_lsm_staging

Step 1/2 in moving all mainstream development to master instead of fullstack_lsm_staging