merged hotfix 0.13.3