Merge branch 'adding-sparx5-es0-vcap-support'