* commit 'd47be031378e2ff43d61099ce5502f9428242eaf': Restore 4 classes that were accidentally deleted