Merge fork from luckval