Merge "Easter egg cleanups." into klp-dev