Merged latest changes from developer branch and linux-rnd branch, pushed to GitHub