PCT-562 Changes for PR #118