Some changes from user 1
Merge commit '888ff3e20f4cb8742979caeaa680fcd3a6bf2e75'