Merge speed and stability improvements from development branch