[#8536] move/improve |safe usage
9 files changed