[#1563] Defects related to story #1246 Do NOT merge