Issue #2340401: Fill commented entity during stub comment saving