merge up from r7