[#8536] remove unnecessary |safe usages
16 files changed