[tbb-commits] [rbm/master] Merge remote-tracking branch 'boklm/bug_24931'