Update cherry-picks and directory clean settings