GIA-3155 revert changes from commits on GIA-3133 which were pushed up by mistake as not been pushed on the GIA-3133 branch