Promoter's fixes now applied

Change-Id: Ib7e69ae3f3dfdb70fe747ac7416b3a0bc5ea236c