FEND-809: hand merge the code