ticket:6 fix+merge