Merging updates from sam-realself