revert previous change
Merge branch 'dynamiccap' into testing