update production branch, case #36