[OWD-26852] [OWD-26847] Unblocked & re-styled