Merge "Use a flag to determine isRenderable" into main