Merge "Changes done to improve error log percentage"