Backport of #7259 to stable5

#7259 clickable