[OE-3274] Reverting change which used opnote eye
Remove redundant collations
[OE-3607] Added missing out of order migration
Merge branch 'release/1.5' into develop