Merge remote-tracking branch 'origin/master'

Conflicts:
	sc_search_basic/sc_search_basic_operations.c
Merge