GPII177: fixed some errors in dynamic: true declarations, cleaned up things a bit
Merge remote-tracking branch 'origin/GPII-177-experimental' into GPII-177-experimental