Catching up
Revert "Catching up"

This reverts commit d1aae95f7c305b43118d250f4cf88d43efda9f0a.
Merge remote-tracking branch 'origin/master'