Bug fix and sync with prod release (local only).