Merge "Add support for pbtombstone executable" into main