Harmonizing changes across branches
Reintegrating Omnitropic changes