Ahodges/doc1278

@stroilova, please review. On your ok, I will merge with other changes from mobile.