Merge regaw-leinad changes to repo