Added build dependency to make and changed some mutex guards.
Merge branch 'mws-dev'