Merge "Do not hide instance field hard failure with soft failure"