merged newdb branch to ops2