Revert to 8a6fc3e67f89770d962125a236bfc404ba163686 (Merged branch OS_v20)