Stage report synched with grails2.4 branch