Fix oracle server error.
Merge branch 'develop' into topic-detail-edit-cleanup