merge from cnnic-warmdawn