Merge "Updated documentation for upcoming fix for @code tags"