Merge "Refactor static input associations"