Fix VANILLA-275
Fix VANILLA-276