Merge "Update barbet SVN to 21" into sc-v2-dev