Merging master.
Ignoring distractions.
wip