BS-10721 - Change the behavior to OR for dynamic and static check