Merging changes with latest fix.