merge with internal bugfix