Merge data stability improvements to master