[TO BE REBASED] Documentation update