Updates for:
RM-6709
RM-6958
RM-7227
RM-7238
RM-7269
RM-7343
RM-8271
RM-8396
