Merge "Docs: fixed variables" into pi-dev