Merge pull request #5384 from salzmdan/knot_update