@miketheman I think this should accommodate any updates / bug fixes to the 2.x branch. Does this work for you?