Core pr 5

Updated contrib modules.