Merge branch 'feat/apply_data_webdb' into develop