Merge from master repository

Merge from master repository