fixing bootstrap / finding bootstrap modules
Merge branch 'master' into kr_server