BS-10721 - Update runtime check