Merge "Remove workaround for end() not supported in some app" into oc-dev