Few issues resolved in ticket#1275
Resolved ticket_1275