firstnotonphone ring strategy no longer works as expected

After upgrading all modules on a FreePBX distro I have installed at a client's office, their phone system stopped working properly. They have a ring group set up with four extensions. The ring strategy is set to firstnotonphone.

According to the documentation:
firstnotonphone: ring only the first channel which is not offhook - ignore CW

This means that when dialing the ring group, the first extension that is not "physically" off-hook (ignoring call waiting), should ring. If there is no answer on that extension, the call should be routed to the failover destination for the ring group (Destination if no answer).

This was working properly, however, after the change introduced in Core-13.0.118.6 (https://github.com/FreePBX/core/commit/d41327d05790e5fc9ede18fc84cccb233fec3200), if the first extension does not answer, the call is sequentially routed to all other extensions listed after that extension in the ring group. Each extension rings for the specified Ring Time for the ring group.

I'm not sure the lines in functions.inc/macro-dial.php were commented out. The previous logic makes sense to me:
Previous logic:
If the first extension rings and there is no answer:
if(RingGroupMethod == firstavailable || RingGroupMethod == firstnotonphone) && DialStatus != BUSY)
{
HuntMembers = 0;
}
HuntMembers = HuntMembers - 1;
...

New logic:
If the first extension rings and there is no answer:
HuntMembers = HuntMembers - 1;
...

With the previous logic, if the first extension not "physically" off-hook (ignoring call waiting) does not answer, HuntMembers is set to 0, and the call is routed to the failover destination. With the new logic, if the first extension does not answer, the call is sequentially routed to the rest of the extensions in the ring group list. This new logic goes against documented/expected behavior of the firstnotonphone and firstavailable strategies.