Merge "Revert "Update felix SVN to  21"" into udc-dev