[PATCH OLK-6.6 0/4] Fix file content inconsistency issue and incorporate subsequent fix patches