Dev error 5476 fix

Please review the information available in this topic -