last changes of bigenablers
Merge remote-tracking branch 'origin/master' into LAST_BEFORE_XSD