[link]
[link]

upstream is merged with lucido branch