CON-1444: Support for current vertical