Merge branch 'feature_input'