Merge "Restore 4 classes that were accidentally deleted" into klp-dev