Merge "Changes in different modules"