Merge branch 'lioncash-hlt' into dev