Merge pull request #3618 from martin-frbg/issue3606