merge #4924 to master