5.15.1 upgrade module + tests