Merge fix-53 into master