implements #16083
@chhitz you were involved in the discussions and the mail with the spec so please have a look as well
