Merged from luxigo:master