[OE-3678] - completed consolidation
[OE-3678] - added tbl_migration check
[OE-3678] - merge back consolidation changes
Merge branch 'develop' into feature/front-end-rewrite