Some pre updates for 3.7 version.