Updates for:
RM-6489
RM-6936
RM-7550
RM-7826
RM-7918
