Merged changes from rubin