Better lock profile
Merge remote-tracking branch 'upstream/master' into next

Conflicts:
	src/CMakeLists.txt