PCT-985 Changes for PR #105