[2021] Current patch as of June 2 2021

Please continue the conversation in the threat @Myrzik_72 linked above.
Thank you and sorry for the frustration!