Updates for:
RM-7928
RM-8130
RM-8468
RM-8624
