Merge recent live fixes back to dev