Fix merge conflicts for @kvarel

Fixing merge conflicts in #4607 for @kvarel