Hi Tsamuras,
You mentioned that a MS Gold Partner provided you the info that a code adjustment will fix the issue. Can you contact them again to get the Piece of code provided? Alternatively, contact MS directly by opening a support case. If they have already identified - and accepted - the issue before and found a solution they usually do not charge you for the support request. All the best,
Ludwig