--HR-321 changes related to status change and UI