Fixed Collapse for Answer
Merge branch 'fix390' into release390
Built 2.8.1.391