Implemented #417. --------- Signed-off-by: George Araújo <george.gcac@gmail.com> Co-authored-by: Amir Pourmand <pourmand1376@gmail.com>