ensure code compiles on Mac
get the shell onoy when we need it
add Narayana5 classes
Merge branch 'master' into 'BS-6668_CustomPage'