Satsuma Release Candidate

merge develop to release/candidate for satsuma release