Merge pull request #2976 from luisfdez/feat/set-ok