cherrypick files to merge #70