Merge branch 'develop' into 596-functionality-on-witnesses-page-is-missing