Restored changes from mis-merge with master