Preparation for merging in branch from mindsnacks/mindsnacks-dev.