Merge "Duplicated 'set-q7-option' command as 'set-option'"