Fix indentation
Update core to latest 3.3/develop
Update minion to 3.3/develop