Merge "Prod fixes August 18th"