Cherry pick in credits develop