Merge bug-fix for peformance issue with PlusRemote.