Merge branch 'remitamine-shahid'