Issue fixing.
Merge origin/master