manual merge between 'hellysmile' and 'martinrusev'