NN-10534: Add mapping fix for not initialized variables.