v1.0.5 add missing code from FUL-103 into the rc