Bcrypt related updates and Merchant view