Changed separator layout to fit better to MGs requirements
Merge branch 'master' into test