Fixed Log issue + Refactor
Merge branch 'master' into GL_leasehold