sync with OC main; current beta development