@kindly I have merged and updated #1105. If you would prefer I do the work on this PR or #1104, please let me know.