Merge "Fix updating of project options"