Implement first batch of configuration flags for #913