force merge: ws-bussines-logic to master