Fixing input addons
Merge branch 'fix-input-addons' into develop