Covering situation when returned status is nil
Merge branch 'fixing_initial_state_support'
Heroku domain initial state support
Merge branch 'heroku_domain_initial_state_support'