Merge remote-tracking branch 'origin/release/3.0' into fix/search_result_pagination
updates changelog #2616