Merge PR from kugel-