Merge "Adapt documentation wo be comply with Apex Integration Guide"