Merge changes from topic 'bp/input'