ACTION-1334: Complete edit from issue-485