ART-1097; Fix weird tail case
Merge remote-tracking branch 'origin/kti' into kti