TRQ-2866 and fixed compilation errors from a checkin in a05055e09ca9cc6a7569254b93bb88aad34179b3.