Merge "Remove the duplicated call with Focused call" into devel/master