Merge updates from mrose17