Updates for Dahlstrand's request ticket #6581