Items #18 and #19.
Merge branch 'advent'