Chasing head

Make the module working with 8.0.x HEAD