added self-check
Merge branch 'release/alpha' into release/production