[DF-4438] - additional fix for platforms.