Rebased and squashed. Authors: Claire and Ganfra
This reverts commit 99a906fe9b584e5adaeb4fdddd62a158bc1f2efc.