#262 & #265 on original CasparCG Branch