Port commit changes part
Complete commit section porting