@marchibbins ok - this is now resolved and merged - see discussion on #2711 & the email that should be in your inbox :)