Massive commit after months of inaction