WIP: Will get back to this after the release of 1.6.2.