Merge "Replace @remarks by @note"