merged with generalized options
Merge branch 'master' of na62farmui1:/git/na62-farm-telsim