Ya, I’m not considering trying the O24 either.
BTW, I have an issue when modifying the br-lan bridge on version 4.7.x firmware since I have VLANs configured on it because of the confusion with the VLAN Filtering checkbox. So you might experience this situation as well.