Thank you very much for your reply.
I have this issue on 3.1.3.
I am not sure if I chose 3.1.4 in the form when I posted this topic.
We've just published our environment to production in mid Sep using 3.1.3. I have to wait for approval ( huge process) to upgrade to 3.1.4.
In the mean time, could you please confirm if we can do some fixes in 3.1.3.