update production branch for case #35