GPII-177: Removed unneeded dynamic: true
Merge branch 'GPII-177' into GPII-20