Updated master with Stand-alone.