CTL-259 Updated FinalBuilder projects in preparation for major checkin