RSF-12 Updating master for 11-SNAPSHOT