@yui-knk do you think it might be possible to include #1092 in this PR, or before it? I don't have the time to work on this tonight.