Moving all commited and temp changes from KRF repo