GMKANBAN-7812: Adding non-interaction flag

Code changes for GMKANBAN-7812