Massimo manually applied older diff file. He also merged my newer diff file. So Optimized code
issues #2006