Fixes the remote provider application updates.
Merge branch '2.2i4' into qa-sprint