Committing some notes
Merge commit '79130625ee55e7cb8cae47d48b089cb35e9bc2e0'