Cherry pick old changes from develop.