Update math, config from develop.