Merged changes from Jan.