FLUID-5532: More work for the UIO mobile.