Merge branch 'dev', remote-tracking branch 'origin' into 146-improve-conversationchain-node