Text by Marian
requested review from @jcury
assigned to @mdomingu
merged
mentioned in commit d5d66003