Runtime options 2501

Ready for merge.