Fix
Redesigning build sequence.
Merge remote-tracking branch 'origin/hardcase_work' into Highlighting