sync: align develop with master after v1.0.154 release#100

flupkede merged 21 commits into

developflupkede/codesearch:developfrom

sync/master-to-develop-v1.0.154flupkede/codesearch:sync/master-to-develop-v1.0.154Copy head branch name to clipboard