Merge branch 'marcio/answer-challenges' of github.com:paritytech/substrate into marcio/answer-challenges