Merged KVP to Master branch