commits from colombbus/master