Merge branch 'checkin' into resinfo