HK commit 10/18/2014