Merge remote-tracking branch 'origin/develop' into feature-finalcall

Conflicts:
	autowiring/hash_tuple.h
Fixing MSVC warning
Merge remote-tracking branch feature-finalcall into feature-elsefilter

Conflicts:
	autowiring/hash_tuple.h