Fix active buttons
Fix strict error
Merge remote-tracking branch 'origin/experimental' into experimental