BFS: FREE SHIPPING Bug resolution from staging