Squashed merge dev, we are almost there!