[CLC-1662] MyUpNext model rewrite
Merge pull request #946 from yuhunglin/CLC-1662

[CLC-1662] MyUpNext model rewrite