Update, closes RBRM-927, RBRM-913, RBRM-901, RBRM-883