Please, merge the following changes