[FIX] Merging hotfix for nightly builds.