Initial commit based on MH 1.4.x branch