Added additional commit in conjunction with VIX-192 and VIX-218.