Merge "Bug 2318: Follow-up changes for previous patch 12535"