Based on Core Console 1.7.0-SNAPSHOT
Change setup based on 1.6.x branch