bumped to latest common with associated friend changes