merge sandia cherry-pick via develop