Add new config vars enabled in 07b50a07e0007ac43327d31568b5a7cc26f3e0f2