Merge "Revert public API changes. Handle methods." into devel/master