Merge pull request 'Magical patches' (#357) from magical-patches into develop