Multiple feature merges and documentation updates