Reify on create on branch 3.0-stable

Merging fix on stable branch.