Feature/fs2 backend stability (GH 555)

See #555 and the soon-to-be-closed #591 for prior discussion.