Issue# 1327 and 1326 are resolved