Merge from test branch - 201405 upgrade