Merge "Reinstate sleep pending better fix"