Merge "Fix file print logic bug and update whitelist"