Integrating open pull requests & additional fixes

This request integrates RIPD-516, RIPD-535, RIPD-537 and RIPD-538, and includes fix ups to address comments made.