[UNICORN STUFF] refactoring: Elvis has left the building: refactoring the input vars
Merge commit 'c296de0a0749af17722f1dd1729c014235bc3be0' into develop