Pull request from REV fork