[No reviewer] Merge from jmmL fork

Merging pull request from jmmL to manage merge conflicts