cherry pick squash of e09ff8b07703...ae03af280d89 from master - various remotebackend improvements by Aki Tuomi