Merge development branch with restricted

Conflicts:
	tests/suites/test_suite_x509parse.data