[CLC-1133] Fix stub ordering