Integration of modifications from the standalone repository