OOIION-1396: Make instrument status computation more robust