Ahodges documentation sprint16

Changes for AN-374 and AN-482.