Fix conflicts with master Fix rubocop offence Add cr remarks
Attach a file by drag & drop or click to upload
