Hotfix/4 1 fix import

same commit as previous PR on master applied to 4-1-stable - not sure about the workflow, just let me know if you'd rather use another method for getting this into 4-1-stable (if you are ok with this ...)