Merge "Clean role manager adapter comment"