Pulled in changes from iMedia 2/sandboxing