Merge "Added flag for revamed category page according to modern architecture" into main