sc03e: merge from i9305