Jaina patch changes