Update RDS format generation to unstable branch version

Unstable commit at time of checkout:
0b7dcb457c095c1dea86f010d19472ece8e6b478