Version 0.0.3 mainly for issue 11164

https://redmine.techbang.com/issues/11164