Merge in updates from bflad