Comment 3 for bug 1739688

Item # 5 will be implemented in Bug: 1741799