KFSUPGRADE-997 merge of changes into master