Merge "correct rst files Issue-ID: EXTAPI-74"