us#32380 User stories