COMP: Use functions instead of strings
Merge branch 'bug-18353-comp'