Merge branch 'asterix_lsm_stabilization' into jarodwen/hotfix/issue395