mini hotfixes
merged
mentioned in commit 05d0ff4a
mentioned in commit 63b55c6d
mentioned in commit 684dc8a0
mentioned in commit 8f7a90e4