SI-7777 SI-8006 assorted fixes for dynamics