[#1028][feature] - Reusing code with macros: additional cases in copy of expression function
[#1028] - Revert test