redo logic to avoid Travis failures
Merge branch 'develop' into pe-post-migration
To hopefully fix Travis CI build failure