Bug 988498 - [meta] Calculator Visual Refresh
fix merge conflicts
freshen zip