Fixed REST
Merge origin/master into FINAL