TIMOB-6142-Doc changes based on review feedback