Fixed Controller's input
Merge branch 'development' into dev/j2/free