Pushing 8.18 support with initial support for recurring