v2.3 update source

very delayed update for v2.3 source code