Fixes #4638: Add system variables in cf-clerk