This logic has been updated in the v2.4 rev3 update (attached at the end of this answer record).
The attached rev3 update also includes the rev2 updates which resolved:
The attached rev3 update also includes the rev1 updates which resolved:
The v2.4 rev3 core is preproduction and hardware testing continues.
To install the patch, follow the instructions in the included readme file.