Wow, I just realised that option dialog is gone before this PR :)