readded frontendoptions ifdeftoif and decluse as they were removed by the merge
Merge remote-tracking branch 'origin/defusecleanup' into defusecleanup