preparation for ASM336 & 2nd week tablet fixes