Inputs divided into two
Merge remote-tracking branch 'origin'