This is to support the use-case described in FACTORY-3896
+1
Looks good to me.
OK, I also didn't find any problem. Merging.
Pull-Request has been merged by onosek
This is to support the use-case described in FACTORY-3896