Update config, static_assert from develop.