Since include is used for non persistent properties, the constraints are nullable, hence null-check added
Merge branch 'feat/scaffold-include-property' into merge-with-1.4