Update changes since 3.6