Merge commit 'smcv/ready/trivia'