fixed overwriting of local options
Merge branch 'setlocal' into combined