Merge "Fixed File Assembly Issues"