Periodic merge: Development branch stabilized; merging to master

Development branch has temporarily stabilized; merging to master