Temorary fix for #2911.
Fix for #2897.
Merge branch 'sequence-fixes-ui-updates' into sequence-fixes-ui-updates-greg