[merge] more tarkin customizations