(cherry picked from commit 4971b9cad0)
4971b9cad0
layout
variant
Also default these options to `null` for state version ≥ 19.09. Fixes #811 Suggested-by: Sean Marshallsay <srm.1708@gmail.com>