Merge "FIX: Handling of git topic when push upstream"