Component calculator updates

Merged username-removed-187712 requested to merge feature/CalculatorUpdates into develop