Merge "Update Documents & Others to Document & Other"