Extract changes by @synesthesiam in PR #797
Merged with ahojnnes novice