Revert "Revert "Merge "PEEK [1/2]" into kitkat""

This reverts commit 037d35604c81103eeca74b8c412f076abe296d29.