SIO-1195 possiblity to change submission kind

Change-Id: I24d1812ab56cccb4a492a2587b50575514e21eab
Merge "SIO-1195 possiblity to change submission kind"