merging updates to main release