backporting latest module

@feanil @jarv pulling in this module from the the future.