Fixes FORGE-1161 : Proxy type hierarchy must maintain a specific order