Friday end of day merge with alex
End of merge with Alex