Merge pull request #4711 from aparcar/uci