Merge back changes made in FRC-3128-2015