merge sandia cherry-pick