INFR-25344 - Fixes
INFR-25344 - Spinner
INFR-25344 - Spinner