Back port variable initialization fix from development.