@cspeckmim: Is there any chance this will be merged into master? (Sorry for joining in late)