merge scody-default with master