Updated all modules to latest contrib + core