fsm: Remove internal refreshes
Merge remote branch 'mt/bnc880664-2' into testing