Fixed master merge