Fixes for case SVY-7158: 'smart' property values were no longer useable
after first commit(s).