FLEX-33748 Accept patch from Maurice Amsellem