Fix for brian - pranswer issue
Merge branch 'defect-pranswer' into develop

* defect-pranswer:
  Fix for brian - pranswer issue