Merge branch 'fix/fm' into 'develop'

Follow-up fixes to the federation-lifecycle proxy

See merge request !29