Syncing up with latest changes to official piggybak master branch