Merge latest changes regarding push functionality