Runtime options 2501

NOT for merge. This pull is intended for TRACKING progress on a very big ticket.