*8162* Final commits
Spacing
#4668# move existing setup options to 'details' step
Initial import of OMP