Merge "ASM - Bug fixes for clearTopIfNeeded" into udc-dev