Thanks Stephan. Neal please accept review on SR#1008129 2x so this can go into the repo via optional maintenance update