Merge "Check new multi-instance app property for multi-instance support" into main