Just to let you know that in the end we DID migrate to 4.18, and this problem pretty much disappeared. Thank you