Aqua 13 07 acu96973 fixes and time support

Please review