Merge branch 'status-attaching' into dev

Change-Id: I2935b2ea07af115110a71c5f31d1009d2b2adf2a