back porting of loading indicator fixes from development branch