CON-2265 | Fix for bugs introduced by Venus