[#8536] more move/improve |safe
3 files changed