UAR-609 Base files from foundation - formatting adjustment