COMP: Migrated geometry changes of planar figures into diffusion plugins.
Merge branch 'bug-17739-Fix13'