Merging in Angularify+Dice singleton changes