So I am going to split this into 2 different fixes, with 2 different jiras. This one will address the specific issue reported here. In fact I already have that working locally. I will apply this to master (5.0) and port it to 4.3.

The bigger change, however I will only do for 5.0.