core/contrib code updates