Build/Rat fixes ACCESS-9 for ACCESS-12