Experimental for 1.5.2

https://github.com/Nekocraft/TODO/issues/16