Reliability improvement first commit