update with latest ika-controls changes