Merge "Fix property setting with failure"