Merge "Updated Module markings"