Merge "Add support for Laki"