Add changes from other projects

• APIA
• Warranty Expert