FUJI: imported/updated/added latest changes to os branch