KFSUPGRADE-1003 initial merge of asset tests to master