DF-5048 handling loading unordered prototypes
merge