fixed merge conflict for branch 'Bfinity-messagebug'