Delivery done. #sneg-17 fixed
Merge remote-tracking branch 'origin/master'