Merge "Improve power fail/reset"