FEND-989 and FEND-1038 fixes.