pull fixes based on ticket