Merge branch 'fix/static-fe-nil-bio-crash' into 'develop'