Merge "Synced the code from master branch"