Merge previous commits

Merge previous commits
Merge commit '197ba15' into patch-1