Resolves: FACTORY-5985
:+1:
rebased onto fd45eede1c83296fca74a565e6f456a201afe08b
Looks good
Pull-Request has been merged by gnaponie
Resolves: FACTORY-5985