Merge branch 'hotfix/LOBs' into develop
Fixed time elapsed
Merge branch 'release/V0.4.1'