Wrapping up the unifinished business before merging new changes from master