Merge "Fix sandman crash" into sc-dev