fix for showing shipping address info
merge upstream
merge