Branched current code due to regression (v1.4.x) v1.3.2 will be an updated v1.3.1...