KNL-1264 merged from Sakai