d
Merge pc7 and previous fixes