Merged changes by sat