Merge "newton and ocata sync db fix"