Updated contrib modules and core