Merge "Imported Scudo Standalone changes:"