Fix asset file
Fix dock plugin
Merge remote-tracking branch 'composer/experimental' into experimental