Merging the lasted unified changes by gshackles into the fork