Merge "Fix build break (include current.txt)"