Merged OSAL 4.1 changes (developed outside of git repo)
Merged OSAL 4.1 files (developed outsid of git)