merge of 5624-1_0-release branch