Temporary change for VF-5666