This should be addressed by the latest snapshot from now on, hence closing. Thanks all for your contribution.