Merge "add info in doc Issue-ID: EXTAPI-74"