upkg and added csmt patches