#16661 Fixed conflict with usability