Merge pull request #18238 from agileware/separator-not-seperator