proper merge of hotfix with latest changes
proper merge of hotfix with latest changes

thinkbeforecoding/Paket,mrinaldi/Paket,mrinaldi/Paket,lexarchik/Paket,Stift/Paket,isaacabraham/Paket,sergey-tihon/Paket,lexarchik/Paket,0x53A/Paket,inosik/Paket,mrinaldi/Paket,thinkbeforecoding/Paket,lexarchik/Paket,NatElkins/Paket,jam40jeff/Paket,lexarchik/Paket,mrinaldi/Paket,vbfox/Paket,cloudRoutine/Paket,vbfox/Paket,artur-s/Paket,isaacabraham/Paket,artur-s/Paket,thinkbeforecoding/Paket,cloudRoutine/Paket,isaacabraham/Paket,Stift/Paket,sergey-tihon/Paket,0x53A/Paket,0x53A/Paket,cloudRoutine/Paket,baronfel/Paket,Stift/Paket,theimowski/Paket,vbfox/Paket,Stift/Paket,NatElkins/Paket,baronfel/Paket,isaacabraham/Paket,fsprojects/Paket,theimowski/Paket,cloudRoutine/Paket,fsprojects/Paket,vbfox/Paket,jam40jeff/Paket,NatElkins/Paket,inosik/Paket,thinkbeforecoding/Paket,NatElkins/Paket,0x53A/Paket