Merge v40 r22