Build scripts fix
Resolve conflict
Merge branch 'olologin-master'