Fix #221: Use latest common & render features