This is fixed in 3.5, given that the customer says "This is not urgent, as we have the fixes already applied via our custom template. This is only to feed them back to the official template." it doesn't need a back-port. If the situation changes and something necessitates a back-port, please let us know. BTW I greatly appreciate the feedback from the customer so we could correct the product even though it does not directly affect them.