Follow-up from "Allen RICH decoding"

@samarian please check whether this has been properly tackled

The following discussion from !1145 (merged) should be addressed:

Edited by Josef Ruzicka Gonzalez