Merge branch 'vfycompsig_0.5.0' into 0.5.0.x