added changes for stable branch