Updated version for the integration branch