Update fork from Development

More fitbit intraday mods