Merge branch 'fix/macro-calls-and-changelog-entry' into 'master'
Fix macro calls and changelog entry
See merge request !2211 (merged)
(cherry picked from commit 9b9db541)
Fix macro calls and changelog entry
See merge request !2211 (merged)
(cherry picked from commit 9b9db541)