Merge branch '2913_sanitize'