Merge "Add support for render-ahead"