Merge "Update Barbet SVN to 15" into sc-qpr1-dev