BZ986000 - DRL-to-RuleModel marshalling improvements
(cherry picked from commit 0a085c712c3a3c04259fcfc39446fe1abf651105)